gnomeos: Rename images to "runtime" and "devel"

They're just better names, and this matches what the
default artifact splitter is doing now.

diff --git a/gnomeos/yocto/gnomeos-run.sh b/gnomeos/yocto/gnomeos-run.sh
index b4d342909e7321627a9cb618ee8a211528f8ef1f..eb556651ad253da7e780f422727eafd282678a42 100755 (executable)
--- a/gnomeos/yocto/gnomeos-run.sh
+++ b/gnomeos/yocto/gnomeos-run.sh
@@ -76,7 +76,7 @@ if ! test -d ostree; then
 fi
 cd ostree
 ostree --repo=${OSTREE_REPO} local-clone repo
-for branch in base dev; do
+for branch in runtime devel; do
     rev=$(ostree --repo=repo rev-parse ${BRANCH_PREFIX}${branch});
     if ! test -d ${BRANCH_PREFIX}${branch}-${rev}; then
         ostree --repo=repo checkout ${rev} ${BRANCH_PREFIX}${branch}-${rev}
@@ -101,7 +101,7 @@ if ! echo $ARGS | grep -q 'root='; then
     ARGS="root=/dev/hda $ARGS"
 fi
 if ! echo $ARGS | grep -q 'ostree='; then
-    ARGS="ostree=${BRANCH_PREFIX}base-current $ARGS"
+    ARGS="ostree=${BRANCH_PREFIX}runtime-current $ARGS"
 fi
 
 exec qemu-kvm -kernel ./tmp-eglibc/deploy/images/bzImage-qemux86.bin -hda gnomeos-fs.img -net user -net nic,model=virtio -append "$ARGS"

diff --git a/gnomeos/yocto/recipies-core/images/gnomeos-contents-base.bb b/gnomeos/yocto/recipies-core/images/gnomeos-contents-base.bb
deleted file mode 100644 (file)
index d70a704..0000000
--- a/gnomeos/yocto/recipies-core/images/gnomeos-contents-base.bb
+++ /dev/null
@@ -1,8 +0,0 @@
-#
-# Copyright (C) 2011 Colin Walters <walters@verbum.org>
-#
-LICENSE = "MIT"
-LIC_FILES_CHKSUM = "file://${COREBASE}/LICENSE;md5=3f40d7994397109285ec7b81fdeb3b58 \
-                    file://${COREBASE}/meta/COPYING.MIT;md5=3da9cfbcb788c80a0384361b4de20420"
-
-inherit gnomeos-contents

diff --git a/gnomeos/yocto/recipies-core/images/gnomeos-contents-dev.bb b/gnomeos/yocto/recipies-core/images/gnomeos-contents-dev.bb
deleted file mode 100644 (file)
index 3227c2f..0000000
--- a/gnomeos/yocto/recipies-core/images/gnomeos-contents-dev.bb
+++ /dev/null
@@ -1,14 +0,0 @@
-#
-# Copyright (C) 2011 Colin Walters <walters@verbum.org>
-#
-LICENSE = "MIT"
-LIC_FILES_CHKSUM = "file://${COREBASE}/LICENSE;md5=3f40d7994397109285ec7b81fdeb3b58 \
-                    file://${COREBASE}/meta/COPYING.MIT;md5=3da9cfbcb788c80a0384361b4de20420"
-
-inherit gnomeos-contents
-
-PACKAGE_INSTALL += "task-core-sdk-dev \
-               bison flex \
-               git \
-               pseudo \
-               "

diff --git a/gnomeos/yocto/recipies-core/images/gnomeos-contents-devel.bb b/gnomeos/yocto/recipies-core/images/gnomeos-contents-devel.bb
new file mode 100644 (file)
index 0000000..3227c2f
--- /dev/null
+++ b/gnomeos/yocto/recipies-core/images/gnomeos-contents-devel.bb
@@ -0,0 +1,14 @@
+#
+# Copyright (C) 2011 Colin Walters <walters@verbum.org>
+#
+LICENSE = "MIT"
+LIC_FILES_CHKSUM = "file://${COREBASE}/LICENSE;md5=3f40d7994397109285ec7b81fdeb3b58 \
+                    file://${COREBASE}/meta/COPYING.MIT;md5=3da9cfbcb788c80a0384361b4de20420"
+
+inherit gnomeos-contents
+
+PACKAGE_INSTALL += "task-core-sdk-dev \
+               bison flex \
+               git \
+               pseudo \
+               "

diff --git a/gnomeos/yocto/recipies-core/images/gnomeos-contents-runtime.bb b/gnomeos/yocto/recipies-core/images/gnomeos-contents-runtime.bb
new file mode 100644 (file)
index 0000000..d70a704
--- /dev/null
+++ b/gnomeos/yocto/recipies-core/images/gnomeos-contents-runtime.bb
@@ -0,0 +1,8 @@
+#
+# Copyright (C) 2011 Colin Walters <walters@verbum.org>
+#
+LICENSE = "MIT"
+LIC_FILES_CHKSUM = "file://${COREBASE}/LICENSE;md5=3f40d7994397109285ec7b81fdeb3b58 \
+                    file://${COREBASE}/meta/COPYING.MIT;md5=3da9cfbcb788c80a0384361b4de20420"
+
+inherit gnomeos-contents